Thank you, Richard. Changes: * Don't use spelling location. * Add `tok::r_paren` to stop set. * Check `FRI` instead of `ForContext` and `CPlusPlus11`. * Invalidate FRI->RangeExpr Committed in r208299. http://reviews.llvm.org/D3370