A few cleanups, done while testing for a bug