Simplifying the shim.

Bill noticed the same thing I did, so I put in a quick fix   The shim can be much simpler anyways.  Should fix issue #11.