Misc cleanups in sight of v0.7...

In particular this fixes cms-sw/cmssw#76