Broad contours of new farm bill begin to emerge