Doc and identifier fixes.