Small cleanup to simplify DefaultMockConstructorGenerator