More code cleanups.