Make the packed and helper_fall_through layers more explicit