Switch this malloc to a calloc, take out now-unnecessary
initializations, and align what's left.
Minor rewrapping of lines in AddIconManager().  No functional change.
Break up a couple conditionals and add some comments through the first
bit of this func.
These two vars are only used inside this scope, so narrow them in.
This is also only used in here.
Add a few more comments, and rearrange a couple lines.  Should be no
functional change.
Less bad engrish.
OK, astyle really wants this pushed over, so give in.
Add "unnecessary" braces around these for loops.  Their bodies are an
if() that _is_ braced, so leaving them off on the for looks too weird.
Little tweaking, mostly in AddIconManager() and some related
functions.

Minor preening of the code.  Mostly a little reordering and a lot of
comments written in figuring out the code for myself.  Should be no
functional change.