Small code cleanups.