Various small merge conflicts and tidy fixes.