That traceback exists on master - I just split it correctly.
What you suggest could be part of another PR.