Second pass fixes up variables now to.
Shut up die spam.