and just move the non-alias expansion printing bits into the else clause, including the newline and comma printing.