Reverted back to sequence+map to avoid GHC issue when dealing with Arbitrary instances

[elland]

We can change this back if that gets solved, or we develop a better understanding of the issue.

Checklist

• The PR Title explains the impact of the change.
• The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.