Tests pass through 08b (with argument in 08a restored).