Neaten monkey-patching