2nd attempt: Simplify ELB collector

Merged in the latest master