Various minor cleanup

Really minor tweaks.