Fix StmtContext.findSubstatementArgument()/hasSubstatement()