A bit of code-cleanup. No changes.