For #855/#867: remove separate sanitize properties