Add some debug code for pinpointing #31.