More NFA work.

#teamnosleep