[pl] generalise rules and disambiguation to catch more mistakes