Eliminate q_or_aux variable.