Simplify shim generation.
Merge pull request #8 from rwjblue/simplify-shim-generation

Simplify shim generation.