On top of #1186 .
I feel that this is an improvement, but it touches a lot of lines and so it deserves a separate discussion.
On top of #1186 .
I feel that this is an improvement, but it touches a lot of lines and so it deserves a separate discussion.