[CS] Simpler guard logic