Slight code cleanups.