Fix post-increment of iterator that may conflict with current value
(happens to crash on OSX).
Remove dummy class member that used to work around a bug in the now obsolete MSVC++ 6 compiler
Always include icons.h, fixing failure to show html editor icons on OSX.