Highlight the entire variable name, not just the dollar sign. Fixes #1201