Merge "Don't implement our own remove_cvref_t."