Indentation fixes

This makes model.xml about 20kb smaller. Most inconsistencies were
introduced when unused tags were removed, like <optional>.

Change-Id: I5e77860cf09bad4cad3e9dd7383371a10386c260