[WIP] clean explicit + calculated VM handling

using the P2GAM handler (but not in sub-mappings) ;
some use cases still don't work (e.g. AA-4).