Good idea, though I'm going to punt on this for now because it's mainly an esthetic change. Maybe I can do it as part of #2029.