Expand on the AliasSetTracker a bit, so I can remember this next time I come back...