Use: #pragma GCC trailing_semicolon
  Remove add_semicolon_if_needed() and its:
  /* FIXME this is wrong in the multi-line case.  */