Tweaks and cleanups.