I suggest we don't tweak the current format anymore, but fix this properly in .eb format 2.0.

I really like @JensTimmerman's suggestion on using two-element tuples for the common case, and dicts for the more elaborate cases. Let's follow up in #691.