Phew, refactoring now actually showing a full pie.