Minor clean up, removing PrimWrapper.