Replaced unused_type to avoid ADL issues