Make sure sorts are used correctly, let type sigs have builtin sorts