Fix up Hash{Map,Set} imports