Reintroduced Option::iter()
Cleaned up some of the useless ref->deref patterns