Remove dependency on data-type.