Merge the latest trunk enhancements into the indexed-subtype-expr branch.