More grammar changes.

Renamed sub-expression to subexpression.
Added object-predicate and array-predicate.