BTW I also updated my copyright line in the process.  I should probably
do it in other files as well, since I've patched my name IRL as well.