Negative predicate return value clean-up

Hunt down more undefined's and nulls leaking into the token stream.

Change-Id: I2a3b954720b7e682cfb3e292b455254b0ba93141
Merge "Negative predicate return value clean-up"