Massive performance improvement to --one commandline option.