Minor compiler code cleanup