Make it work correctly for whiten=full as well.
(#529)