Drop wrapped/unwrapped distinction.