Moved hidden utils so they're namedspaced in ds. Extracted skip logic to
nicer abstraction (a static method).