We need to merge the v4 library changes, API and whatnot, from KfM into
the trunk, as much as possible.