Some cleanup and use \with.