Minor cleanup and tweaks.