Minor tweaks to Contains/IndexOf() to take CompareOptions - and other minor cleanups