Switch hashes to newer syntax