Some small tunings and cleanups.