Fix comments and local names.