Fixes #20, stop using Hash#key?