Safer 1.9 style hashes

Following the discussion in #22.