Minor ivy.xml tidy-ups