Fixed incremental module extraction (fixes #74)