Better support for underscores and uppercase together in variable names.