Changed a little more parsing predicate code