listener_mrp_client: minor, small cleanups, homogeneity