Doing one thing at a time so as not to confound the git.