I think that is a good idea to streamline the code.  The performance hit of always using the indexed insert should be negligible compared to the constant re-rendering that this pull addresses, so good suggestion.  I've got some time to work on this at the moment.