extra: handle MOD_ASSIGN better