More cleanups and tweaks.