Added support for varname with dashes.