Reverted commit below as the cc65 bug in question is fixed.

Rearranged some expressions to avoid triggering a cc65 bug. (reverse-merged from commit 7134da0915cf56c7eeff2cd22b6b3ddeff5e7e33)