Your fix modifies the return values of a public method (by removing the 'extras' key). Here is an alternate fix which maintains the same return signature while allowing keys in 'extras' to override the other keys: