Personal preferences regarding #2093

While reviewing #2093 I had a couple "you don't **have** to implement this, but I'd like to" changes, this implements them.