clean up the api some, remove Pass and Wrap.