guile: head: Address comments on pull request.