Match comments and variables to original.