Solved some merge errors I foolishly introduced.