X11: Clean up code
Save command separator only if it changed or is needed