Reorder class initialiser list to match what actually happens
5 files changed