Cleanup after the OPTIONS parsing was moved.