Rework 'as generic' monkeypatching.