rename *Hash to *Map
rename valid_key? to valid?, deprecated_key? to deprecated?
minor option cleanup