Less indexOf.
Some QP styling fixes.