Update to nightly: enum fallout + borrow in collections