Patch Set 1: I would prefer that you didn't submit this; No score

This is an early draft of this change.  I've since refactored it further in my local workspace.  I'll push an updated revision probably tomorrow.