Look at fuzzel's patch and either work on it to make it apply -or- use it as a shopping list for what needs to be done. Pay attention to data structures which could suffer from growing substantially. Some may need refactoring.