Cleaned up calls to InterpreterTools.