Pull two helper rules into their main rules.
Pull two helper rules into their main rules.

After all the transformations, they weren't complicated enough to
need to be their own functions.

danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat