Remove geometry/instrument doxy warnings. re #6485