Merge in small changes from e7c265d missed in the merge of the instrumentation work from master.
Hackage update