Add more parameters to skip highlighting

This allows you to skip it all together which might be a useful test.

Change-Id: I1523fdf58f3d5d1310994a82e2b3dcb74aac44ec
Merge "Add more parameters to skip highlighting"