Refactor overrides management in typing.js