Update due to recent changes to the hash-set API