Stefan Kangas <stefankangas@gmail.com> writes:

> Would you like to send a patch along these lines?

Sure, here is: