Hrm.  I may have been overzealous in my desire for consistency.