I've pushed your latest patch here:
c5a9b16dbdc8849560fb43095e090ba0952277b6.

The only change I've done beside indentation is patching the scripts in libexec/.

Thanks for your patience!

-- 
Pierre Neidhardt
https://ambrevar.xyz/