Minor fixes.
Simplify dealing with private info.
Remove unused options.