I should also have noted that the fix is in four commits (including Pasi's) for better separation of issues.
I should also have noted that the fix is in four commits (including Pasi's) for better separation of issues.