Third time lucky?  Merge changes for EventNavigator.cpp, instead of there warts and all "diff --stupid" version.