Refactor stmt/stmts rule. No functional changes.