(Before merging to HEAD we need to tidy up and write a proper commit message.)