I've left some notes at the discussion linked to above. There are some entries that need attention before the change can be made.