rustc: Unify variables using a single type instead of keeping a list and doing it all at the end. This will give us better error messages.