--raw was not always doing the right thing w.r.t. one-lining children. This checkin fixes that