@cmr you know I agree but, as I said in reply to someone making the same point in IRC last night: let not the perfect by the enemy of the good.

This is a specific fix to an issue I encountered in the while and counts as progress. By all means let us open up a follow-on issue to address this, but let's have that discussion somewhere else and not in this PR, whose specific issue is blocking me :P