de-deref everything

fixes #2698