Unlazyfication-related refactoring