minor code cleanup release

No externally visible changes.