Added type1.whatever == -1 comparisons