And the fix for the `-=` above was not simple...