More racecondition elimination.