I realised that -- I'll update this code to use the new functions when that request gets committed. Thanks!