Clean up some more regressions from #420 sync-var-by-ref