@nulltoken I can look at doing this, but I think it should be done in a separate commit (either included in this PR or as a separate PR). I believe this also applies to your comment above (line 78)