C++-ifying alexandria

Change-Id: I307a17b43a610661dbb0b64d2493475f0e15db1c