Replaces "magic" -1 with macro