More super-merge tweaks.