Small cleanups.