Made "clean_key" an instance method again so future sub-classes can override the implementation.