More work on the incremental importing of multiple branches.