We have now mostly removed scenarios and groups out of AliasDefinition
-- except for a temporary hack where I add scenarios back in again.