Made the tests pass with the new aliasing code now that we've verified
that it works in the wild.