Added proper handling of dapToken in wfgen.