#964 introduces new options for explicit conversion of data structures to WrapperCategory but does not use the new options at all places where WrapperCategory is currently used. These places are marked with TODO in the code. The old code is still valid, but using the new options would be nice for consistency.