Nice, and crazy comprehensive. I especially love redefining the wrapper using eval to match the signature of the original.