Changed 'swap_method_strategy' to exploit aliases rather than using 'define' for restoring old methods.