core: Minor cleanup of commit 195c735