Use < 0 instead of == -1 for comparisons

Use < 0 instead of == -1 for comparisons #1298