Use correct keys when dealing with the defaults dict

When checking the defaults dict the keys "m_name" and "m_fun" are already renamed to "name" and "fun" so us arg instead of rarg
Merge pull request #6479 from andersbetner/issue6464

Fix for #6464