Improvement on M3 implementation for C++

[rodinaarssen]

The implementation of M3 for C++ is currently incomplete. The C++-specific relations I've added are mainly based on what I've needed, whereas interesting relations can probably be invented and implemented.