utils/naf.c: Wrap up the state machine correctly.

The old code just assumed a particular resulution (in particular, the
`X' case), which is far from universally applicable.  Now we simulate up
to two more steps, feeding in zero bits.