some empty conditional branches which contained a semicolon were "fixed" by clang-format to contain nothing. add comments to prevent this. (cherry picked from commit 735be3b8)