More (and hopefully for now) the final cleanup for mhl.