Change 'if block_given?' to 'if ::Kernel.block_given?' to prevent block_given? tags in xml.