Minor compiler cleanup and optimization