Merge "Always check eval-ed mode, not raw mode"