Followup to r46648 and fix for bug 17267: when expanding $1 in namespace aliases...