Minor compiler code refactoring