More cleanups and a few quibbles