Rearranged some expressions to avoid triggering a cc65 bug.