Simplify aliases, remove trailing ;s; sync with hg