Compilation with optimizations enabled, tiny refactoring