Ensure simple types are rendered before complex types (fixes #682)

[jminardi]

This fixed my issue, but I am open to other ways to solve it as well.

• [ ] CHANGELOG.md updated
• [x] Rebased/mergable
• [ ] Tests pass
• [x] Sign CLA (if not already signed)