Make various minor cleanups.