I don't want style nits to block this PR, so after this is merged in, I'll play with it, and we'll see if you and I can find something we're both OK with on a separate one :-)