Bug #0095: O(n*n) start-up time is now O(n).