Various and sundry changes and tweaks. Diff it.