Simplify hydration opcodes