OK, currently diagnosing another problem in the meantime, after which I'll do some patch shuffling.