Need to be slightly more careful about monkey patching.