More trivial tweaks.