Type disambiguation for C++11

Not sure what went wrong with the merge base