Fixed #377 -- PropertyFilteredIterable is no longer a type requirement. Cherry picked to 2.4.0-SNAPSHOT.