We should not depend on unreleased, git-only versions.
This reverts commit ee948028.

Still, there are some other inconsistencies between these two files
that may need fixing, like whether to take fork into account or not
and order of arguments.

These are no longer needed, since fill is no longer a type class.