parser: reorder alias expansion routine to return early I think it improves readability to move trivial cases first, and unindent blocks.