Fix use of local variables with self-assign operators