Can't use a 'commands' hash with params from Location.ProviderParameters
plus a tidy up of command expansion, etc