Fix re: UsingConstructor/EnableClassInterceptors