Added more aliases.
Merged in the patch to my local repo.