The code here is passing stuff around in lists of Object, but even
so, it was doing so in a very convoluted way.

Change-Id: I608a066138bde2b659a52f6e6148ac754f75ac74