Updates to capture some "low hanging fruit" for PRIM_BLOCK For/While CallExpr