Convert to new alias syntax

Rewrite most of alias declarations to the new syntax.