Refactor frontend type variables slightly... and break some things in
the process.