Cleanup some cruft that crept in here...

Trying this again, offering it to your 1-3-patch branch.