stupid inconsistency
I wouldn't exactly call this "cleanup"... more like "reuse, for better
or worse".