Simplify the way shims are created