Be consistent and use has_key? everywhere