Use VisitKeys as database
Stop instrumenting CallExpressions (fixes problems with )