Add warnings for disjoint sorts, shorten error messages