extra: improve += and -= handling