Rework in dist tools: removed -file switch; don't fork(); refactoring.