Assorted unbusting.

Gets S05-grammar/protoregex.t passing in full, and probably others.