#11 Minor cleaning (still a lot to do to avoid this huge compilation time of ArrangementDemoWindow)