make pp2mcp relations unpacking consistent across different functions
Must applied in conjunction with Analysis!956 (merged), DaVinci!841 (merged) Moore!2146 (merged)
Must applied in conjunction with Analysis!956 (merged), DaVinci!841 (merged) Moore!2146 (merged)