be omitted. This patch fixes that. It also fixes a bug where the
type text was not wrapped as <type>text</type>.