Fix #503: more correct approach

Fix #503, and also generally fix support for JUMP_IF_*_OR_POP (hopefully).