simplify ThatRule for new predicate adjective
modified time rule for new predicate adjective
Merge pull request #1083 from williampma/ThatRulePredicate

R2L: Predicate adjective modification