Cleanups

In the `declare eq` case I think it's good to have one field per line, even if it takes more space, as it will simplify later diffs (adding and removing elements will result in cleaner diffs). We can always compress whitespace in the post-production stage.