clang: get rid of more "hides overloaded virtual functions" warnings
clang: address "add explicit braces to avoid dangling else" warning