Further fixes for Hash.(classify|categorize) departure