Include value of job rank expression itself in autoclustering. #4403