Clean up remnants from half-done solutions in r49925, per comments on code review