Address suggestions made in the original PR (#2243) and remove Hash extension.