Refactor a few more opcodes