adjust stuff for recent clang

Merge to 1.4 branch