Refactoring so that opcides.lisp stays clean.