Pull in the fix for the goto def when :%Eval-ing.