Remove alias hacking, and fix test instead.