Adjust to Clang changes regarding auto type deduction

Authored by skalinichev.