s4: simplify some overly-complicated logic