commander: remove some if confusion

This is a try to simplify the if statements a bit. Also, a check of
new_arming_state which was impossible, is removed.