Fix for last tunnel variable not being substituted when automatically
resolving command options