General consensus seems to be behind this patch. I have spoken to Mike and he is happy with the result here. I will endeavour to get a patch ready to move to the values discussed in this thread.