On Mon, Mar 01, 2021 at 10:26:40PM +0100, Hans de Goede wrote:

> Mark, does this sound like an acceptable solution to you ?

Yes, I think this looks like a reasonable approach.