check_snl.builders: improve CrossChecker aggregate query