Remove unacceptable NULL pointer hack from mc code.