BEWARE! I think this problem snuck in while I was rebasing earlier - the lines here and below are not supposed to be removed :( when you get around to amending this, please restore these lines so these removals don't happen.