Sundry dependent-name fixes flagged by clang++.