Moving more xhprof responsibilities into module