A few minor cleanups.