improve diag for terminating stmts