Minor template compiler changes.