Not sure I understand what is going on here; can you explain? As this function is only used once I'd rather see it inline too.

If we get this fixed I'm happy to merge this.