Some minor cleaning up of our compiler plugin.