modernization: good catches by clang 3.4!