And at the signature of the `Entry` method. It should be cleaner, both wrt 2nd and 3rd parameters, and wrt the return type. CC @mzhurovich