More small, mostly comment, cleanups