You seem to have started these changes before my recent hacks on that code and not reconciled afterwards. You need to update to today's cvs code and then see what changes are really still required.