Add variable expansion.