This still isn't as separated as I'd like, but it at least moves most of
the burden of alias mapping in one place.