Addressed Ismail's comments and fixed a propagation error introduced with caseTIRIfStmt