Rework the metrics stuff to not use AOP.
Use the metrics module for the site.