Remove MultiCommand and other minor cleanups.