Added whitespace after before name expansion token.