Remove more mentions of the obsolete :immediate flag