So I tried inlining it, but the builds always failed with "patch unexpectedly ends in middle of line", I'll try working on that now.