Adjust binning for unfolding

• Coarser ancillary binning (3 bins for 5j3b/6j3b and 2 bins for 6j4b/7j4b)
• For some variables, use 5 or 6 gen-level bins instead of 7

Note: based on !58 (merged) and !59 (merged) (to be merged first)