Minor compiler refactorings