Changes for "for"-suffix of predicates as stated in #125