Waqar Ahmed authored Jun 27, 2022 and Christoph Cullmann committed Jun 28, 2022

Mostly cleaning up and simplifying things.
Remove the unneeded array, brings a small perf benefit as we don't
have to memset it 0 all the time now.