I can fix here if told what the correct alternative is, otherwise yes, an additional PR (or a PR against this branch) would be appreciated since I'm a little out of my depth here.