Clean up compound assignment operators