Replace test condition with reference to the proper predicate, encode folk wisdom into an assert Reviewed-by: twisti, coleenp