Backup commit. Simplify. Add more primary opcodes.