Sound's good.  I've updated the branch to be in line with your suggestion.