Move XML converters to controller (also fixes warnings).