Switched to direct wrappers.