Here's another cleanup, applied to trunk.

Both decls_match and add_method had similar code to check for function 
version declarations.  The add_method one was particularly confused as 
it checked for extern "C" methods -- which are not a thing.

Anyway, this does the obvious breaking out of a common function, and 
calls it from both locations.

nathan
-- 
Nathan Sidwell