Issue/dont use annotation model for semantic highlighting 1001156

This is a rebase with commits amended of PR #309. I'm pushing this because I'm confident we are getting close to merge it and I wanted to make sure my changes build fine (let's see if the build kitten agrees).

If you have any additional feedback for this patch, please keep using #309. Here, you should only review the commit messages. I'll merge this PR as soon as I get the green flag for #309.