Nuke a lot of aliases.
Added more helpers.