238 cleanups 0

Cleanups from review of #238.