[CR] Small tweaks and fixes.
[IM/CR] Major refactor of SNMP polling code