Fix dangling old variable names.