[662440] Don't expand nested type builders of non-generic types