2nd attempt: Simplify ELB collector

Merged in the latest master
Is this really right? Shouldn't it be `[[foo]]` inside the `[bar]`?