You are right.
A simple workaround would be an additional condition in two files:
Misc/GuideItems.cpp [inside GuideItems::GetTitle]
Misc/Landmarks.cpp [inside Landmarks::GetTitle]
Probably KevinH or DiapDealer will take a look and decide whether such a code is suitable.