We need to get this done at some point. This will also give us hardhat chai matchers, which are better to use for custom errors.