Hi, would someone be so kind as to apply this? It’s a bit of a pain having to rebase it over test file additions. (If you’re worried about the backslashes being non-aligned: Note that this appears so in the patch for module names of lengths 3, 11, ….) Robert