Introducing additional constants in BrowserType, and replacing literal
browser names with the references to the constants. Fixes issue 1630