Some minor cleaning up of our compiler engine code.