Adapt to recent language changes, use new hashing infrastructure