Using C++11, adding a few const statements