fix arg-number bugs and @ORACC@ typo