Replace old clause checking code used in the compilation of calls to the database built-in predicates and methods