92a9b5c3ba
Also, remove a test case which was not supposed to be there. (While that test case works with the changes I committed, testing that test case with the test program is not possible in its current form. I'm working on that.)