Minor code cleanups before merge.