Moving alias expansion yet again - this time into AliasManager itself