Fix cleaning of ?= and ||=