WIP: Improved testing revealed not quite done with workflow extraction.