Minor cleanup after commit 73f5b24921