o Get rid of unused ENTER()/LEAVE() trace macros.
o centralize logging.