No distinction of BaseChangeGuided, BaseChangeFromScratch uses the BaseGuide.remainingBase method.
Added trivial (name-based) extractors for NNOption and RefOption.