Rebased alias refactor

Close #49 in favour of this.  (See #49 for info).