Merge "API cleanup for the spell checker framework"