Rework sanity checks and temporarily remove handling of ranges