#291: Amend incomplete commit 1f15ca4.