Revert "Get rid of typeConstructor in Scan."

This reverts commit 7d70c3a448a6e1fe49dbb6bf74717d03a3f8d442.

I'm running tests on GPU here too. Wait until I reply to merge this PR. We also need someone that reported problem with this to confirm this fix his problem.