After all of that, I finally had to add back the SQLStmtIndex to the WorkFragment because we need to be able to handle sys procs that don't really have queries but have different input parameters for WorkFragments. This seems to be working for some of the test cases. #125