this is something I'll do for 0.9. I think we can survive a couple of manual changes here until then.