Rudimentary attempt at pun generation.
Some TODOs changes from a while back, I think.