In the near future, I will migrate all of this stuff (and likely every other helper) into decorators now that you've added Draper. <3