Partial clean-up of OPSStmt.java.