Refinements to better accommodate empty data sets passed to lower level functions