One of recent commits have broken order-only-tokens feture. Fixed.