Sure, I've moved the code to an extension instead. I'll squash this to one commit before merging.