push const goodness up the call stack
reorder functions in file so that all the static functions can be moved into an anonymous namespace
yet more const goodness being pushed up the call stack