Use options.immediate instead of private methods
* Drive by fix of destroyMachines signature to match call sites.