Bug 836655:  Fix bustage ("comparison between signed and unsigned integer expressions", warnings-as-errors) by using Contains rather than IndexOf.