Remove some manual deref() / deref_mut() calls.