Improving the aliases implementation

@davidcalle hi, when 2.25 reaches stable we need to do something about: