@kukreja-vikramaditya Since `ClassDefHandler` is used by other tokens, not just annotations, I am fine with the fix being inside `ClassDefHandler` if it is possible and not having a separate handler.  Please see if you can fix this as part of this PR.