Added --no-collapse option.