Switch hashes to 1.8.7 syntax