#4680. Group alias.

Not ready for merge.

I go committing gradually, and you give me feedback.