moar clang fixups

Change-Id: Ia800ad78a3d40859a598709f38f6a547f6cb85e1