@trustin I think I would prefer this over the solution in the pull-req. I think it keeps things cleaner separated like @wgallagher stated.