more superficial cleanup. still untested, which matters more this time since there are real code changes.