For #1686: Clearer way to express predicate
Move more property values inline