More separator optimizations