Oops, remove some dregs of debugging.
Catch up with last-second name change.