Make aliasing self-contained

Yeah I'm pretty awesome.