Fix notices introduced in PR #1572.