On testing this fix, I noticed that the tinderbox manual test cases need a revision anyway, so I best file a separate issue on that... Man you'd think the list would become shorter as you work on it ;)