Version 2.

Removes the unnecessary (ice-9 match) use clause I added while
experimenting.