Fixed interpretation of scan variables given on command-line.