Merge: optimisation, extra heuristic for hidden models (deals with re-exports).