It seems that in my haste yesterday I neglected to commit some changes before posting the 3rd patch. Correct patch is attached (and contrib branch paule/sanity-checks has been updated).

Cheers,
Paul