Do we need this parameters at all?  Can't we just say "if (cohortDefinition == null && indicator != null) {" ?