Merge pull request #29 from dart-lang/fixes

Fix a couple more highlight bugs