Prepare for removal of newtype struct deref