[tybalt] De-golfed a bit.
More de-golfication.
Convert to eq_or_diff.
Get rid of a prototype.