Some more code cleanups.