Various minor cleanups.