A little refactoring for the new system checks and handlers