Two variable were defined but never used in what looks like
a copy-paste error or something.

Fix that, which also makes the tests pass.

Change-Id: Iebf48583874977c518d888d9a80bc1f02e2a7f86