Rationalise and simplify the share diff and block solve detection to a common site.