Tweak oneshot parser

This should give better error reporting.