Squash using #if 0 a longstanding TODO to avoid warnings