[pl] more generalizations and disambiguation