Moved some debugging around.