Test, fix backwards compatibility for old slot persistence
Fix bug in AliasMap that caused replacement of non-aliases.