Further improved readability of nextMode/lastMode

It only makes sense to have an else at the end if we have an else on all
of them.