Yes. I thought that it would be better in a separate pull (including moving the globals for profiling into the Gcx class).