Hi Julien, As usual, I tend to be optimistic about the time for various refactoring tasks. Looks like 'passing all tests' is only moderately hopeful news. However, I've found and reviewed 54 potential variable name collisions, and fixed some seven cases in which a lexical variable declared inside a subroutine interferes with access to a same-named singleton. I should have done this before, however the script I wrote for the purpose wasn't working properly... until I rewrote it today. Hoping for the best, Joel -- Joel Roth