I think that would make it a bit nicer, would look about like this (+ some more tests) https://github.com/juliantaylor/numpy/commit/e8f2acb37ee878b1bf6be86abe2970a331e71c09