Tidy up solutions, no impl changes.