Clean up `assortment-pre-wrap` options

[bhagany]

No functionality changes here, just code cleanup. I realized it was kind of silly to have two levels of nested options passed to assortment-pre-wrap, so I flattened it.

[runnabot]

Deployed perun/assortment-opts. View on Runnable. _{From Runnable}