Ya, I agree. I've been toying with that in a local branch. Figured I'd push this much now to get it reviewed.

I'll make that change before we merge.