Simple refactorings to prepare for lazy global emission