Fix concerns raised in review of commit 9b59ac7