Support the spell-checking reconciler

* refactored the annotations logic out to make it look a bit simpler