refactor the var and uvar cases, remove admits

- this removes the need to do huge [change]s which are
  fragile.
- It will also break some things.