Latest optimization-related refactorings