Store aliases by reference, fixing alias replace...