Eliminated redundant scanning for the catfish string.

* Fix for a couple of bugs related to profile guessing from my last CL.

BUG=
R=scudette@gmail.com

Review URL: https://codereview.appspot.com/105030044