Another minor code-cleanup