I'd drop this & just make these inline.  Won't put you through another iteration if that's all, though.  (Still reviewing..)