Make a minor format adjustment in code.
Add _nvwa.h to allow either using or not using namespace.