Changes mostly to get separate indexing of standard predicates.
Authored by: tswift 2008-02-21
Parent: [r5873]
Child: [r5875]