A-normalization, again

This has become the new master, de facto.