Sigh - diff got confused and reported it all wrong, making it much harder to review :-(