Seems like we should probably just leave the header setup here (below one of them misses doing the merge and it should be the same in both cases I believe). Otherwise, avoiding the parse_data and whatnot with block_given? seems reasonable. We may want to print a warning if/when somebody provides both though (as they may not realize it and/or may get unexpected behavior).