Consistently handle prefix skipping, w/ tests