Yet even more wrapper work.