Convert more TypeBasic(...) to builtins, fix one match case