Fixed map/list len handling