Refactoring the System base-class into a pure interface in order to avoid troubles with diamond inheritance down in the inheritance tree; moving the implementation part of System into a new class SystemBase; adjusting SystemImpl and Unit for the modified System interface.