Yet more work on the check command.