Fixed up old profiling code

* Turned off inlining for now so we can play with profiling
  independently.