- if (scm_caar (aprop) != scm_caar (bprop)
- || (!(Input::is_smob (aval) && Input::is_smob (bval))
- &&
- !to_boolean (scm_equal_p (aval, bval))))
+ if (!scm_is_eq (scm_caar (aprop), scm_caar (bprop))
+ || (!(unsmob<Input> (aval) && unsmob<Input> (bval))
+ && !ly_is_equal (aval, bval)))