Debug stuff should go away at some point.