Reference aliases by var.

A few aliases still pointed to values rather than vars which is likely
to cause problems during development.