statusicon: More cleanup, coding style fixes.