Are you coding currently in C++11/14 ? It doesn't feel "bandaid-y" at all.