fixes bug 1064608 - CurrentProducts gets called too often

@rhelmer r?

This reduces it in half just in the tests. 

it's unfortunate that we need to do this kind of thing, still. Is this just to avoid re-writing where this is used later in this function?