Psi-Calculi Revisited: Connectivity and Compositionality (Logical Methods in Computer Science, 2020)