Rearrange to make debug more central

* Try and fix gcov support again