Remove useless comparisons

These two comparisons will always be false if the #to_s comparison will also fail.
Get rid of some metaprogramming in favor of composition