Fixes for dashed variable names, highlighting it.
merge