Get opdecode passing a test; rearrange dominances to match
Tweak symbols