Hmm. Good points. Am I still allowed to land this PR if it is only "more" consistent? ^_^.

#565 is @satsuper's primary goal. The code is ready, and he's just fighting with creating some decent unit tests for it. So I expect it to land within the next week or two (assuming you have the spare bandwidth to review of course!).