2nd attempt: Simplify ELB collector

Merged in the latest master
I think refactoring once there is a need for the same functionality sounds reasonable.