Tweaks to operand decoding.