Added support for underscore variable names.