Eliminated unnecessary ContentType queries that used applabel/model-based lookups.