brain malfunction brb

Oh, by the way, we're back to C++ compiler.
So let's exploit it as much as we can.

Signed-off-by: Andrew Tselischev <andrewtselischev@gmail.com>