Update to solve the LSP errors via typing changes and not by code changes. This undos LSP-violation related code changes.