Fixes to support multiple speller objects, RT #84054