Fix 4_1 assumptions, and assumption issues in 4_3, relates to #64