Remove wrapper function, check specifically in each place.