Schema improvements.
Avoid duplicate class declaration warning.
Minor improvements/cleanup for web indexer.