Record singletons for incremental import

We still need to implement this for flat imports, archives and toppath
singletons. Fixes #860.