chore(web): revert temporary type patches

There were a few temporary type patches I had made earlier in the
refactor chain in order to get a build to pass. After completing the
refactor, I was able to return them to their more proper types.