More work on auto-generated wrapper functions