@moebius, @lyon - if I understood you correctly, OVM and OM shall also be C++-11-and-up? If so, we can avoid some more ifdef complexity by just breaking compatibility now. (If not, I'll revise my make_unique patch)
Let me know if you'd prefer separate PRs.