more on #204
A few other cleanups