Merge "Further refactoring of the bootchart code."