Uncontroversial changes

Was doing a bit more work this afternoon getting my cxx03 branch in shape when I realized these commits probably are just as relevant to the master branch as to a cxx03 branch.