#4137 continue Reflector refactoring