Mainlining some uncontroversial tweaks.

These shouldn't cause any problems with the current user experience.