That seems to have solved it just fine. Thank you!
I'd like to bring attention to this issue again since it's a fairly bad bug. And because it looks like the problem got introduced with change #434, it's probably best to examine it and maybe revert #434 soon, before the codebase gets more complex and it becomes too hard to revert.
Indented function arguments are wrong if function is a class member