Replaced non-generic version of ADD/REMOVE-METHOD by generic version.