Refactoring and bug fixes as a result of dealing with Rootstrikers'
real world data.