Removed 'check_compare_op_field' Specification and other minor changes.