Update deprecated Set calls to use Hash

Fixed my initial commit's typo where I didn't reverse the Hash::extract arguments, should be good now. Sorry about that!