Fixed formatting of a function signature
Reverted an incorrect merge edit, which deleted some patches to the statistics code