Simplify $type detection

refs #4474
Drop empty stats from $data[$type] and $type from $data

refs #4474