Fix #1956 "Relational persistence adds whitespace"

- also fixes #1974
- also omit <xh:meta> element
Minor: imports