Cleanup unapply wrapping