Various minor cleanups in sbr/m_convert.c.