I simplified dfaexec_main in bug#19252, but it was not enough.  This
change additionally simplifies it.  The change induces no semantic change.