Added kLeadingPt and kAngleLeading (needed by Subhash)