Improve !alias handling

Identification: none
Change-Id: I6234c2696195afedabab6fe466af372b390721d3