Support for List and Map

Another instance of `start(start info); body; end(end info)` which I would like to see turned into `wrap(wrapping info, body)`.

But not necessarily now.