Make all the tools use the proper accessor functions.