Tweaking tolerance.
Merge remote-tracking branch 'upstream/fix-trivial-todos' into fix-trivial-todos