Fix for coding style.
Add back r203962, r204028 and r204059.

This reverts commit r204137.

This includes a fix for handling aliases of aliases.