Reviewed each change, and confirmed tests pass. Okay to commit.