Fixes for large operands (> 0x7fff).  Closes #34