I've decided I didn't like the asymmetry of putting the solution