A whole mess of changes which I cannot work out how to commit separately.

I really do not like GIT