Simplify hydration opcodes
Merge pull request #183 from mmun/opcodes

Simplify hydration opcodes