Cleaned up some of the unsafe_unretained nonsense around the view state.  Should not longer be necessary (and if it is they can maintain their own version).