Fix flattening in a few more places where rakudo changes exposed problems