add full variable expansion