Retain whitelisted keys for the eval/prep phase.

fb532b0 reverted this issue back on, because the whitelisted keys were
ignored for the prep phase.

Fixes #770.