More cleanup and rephrasing. Tests still fail.