Re: MciWave: some small cleanups