Some cleanups and tweaks.