More NFA stuff.

The code is still mad at undefined things though.