Replaced ordinary functions ADD/REMOVE-METHOD by generics in phase 1.