bad merge, boo
remove_method was a bad choice here
don't redefine constants, fixes warnings
Ruby has an exception hierarchy! Who knew?