Additionally -- no need to change this now -- but we're removing the use of references where it's not explicity required. Now that we've dropped PHP4 support, assigning objects to variables behaves as though you were using reference notation, so no need to assign by reference with objects any more. Gradually we're removing the extra references -- whenever I touch code I tend to clean that up.