Improve diagnostic for redeclaring static member function.  Fixes PR16382.