Cleanup patch from Vladimir N. Oleynik.