This is not merged yet.  When it's merged I'll do the refactoring to avoid complicating your life :)