This patch replaces the only remaining reference to 
DEPRECATED_SYMBOL_MATCHES_NAME with it's contents (which also contains a 
reference to a deprecated macro).

ok?
Andrew