Shuffle code to preserve short-jump on non-assert paths

Shuffle code to preserve short-jump on non-assert paths #503