Even more wrapper work.