Comments, verifying that I've switched to auto-gensyms. There's still duplicated code that leaves me unhappy, but it isn't worth worrying about tonight
Code merge