Remove more usage of isBasic

which is both duplicated in many places and broken