Simplify <location.find.X.within> tags