; (7) in section 5373— (A) in subsection (b), by striking (including any portion of such pay attributable to comparability with private-sector pay in a locality) ; and (B) by adding at the end the following new subsection: (c) Any annual pay adjustment under section 5303 or similar adjustment and any locality-based comparability payment under section 5304 or similar payment shall be excluded from— (1) the annual rate of basic pay for a position or employee for the purposes of subsection (a); and (2) the pay of a civilian employee paid from nonappropriated funds for the purposes of subsection (b). ; (8) in section 5376(b)— (A) in paragraph (1)— (i) in subparagraph (B), by inserting after Executive Schedule the following: , except that for the purpose of applying such limitation, the rate of basic pay for a position to which this section applies does not include any adjustments under paragraph (2) or any locality-based comparability payment under section 5304 or similar payment ; and (ii) by striking 5306(e) or ; and (B) in paragraph (2), by striking Subject to paragraph (1), effective and inserting Effective ; (9) in section 5377(d)(2) is amended— (A) by striking Basic pay and inserting (A) Basic pay ; and (B) by adding at the end the following new subparagraph: (B) For the purposes of subparagraph (A), the rate of basic pay fixed under this section shall exclude any annual pay adjustment under section 5303 or similar adjustment and any locality-based comparability payment under section 5304 or similar payment, including any changes in the basic rate of pay for a position made under the authority of this section to account for such an adjustment or payment that would have applied to such position if this section had never been enacted. ; and (10) in section 5382— (A) in subsection (a), by striking 5306(e) or