Hack a few explicit constructor calls in there that were implicit before.

Which highlights the fact that the code was hacky in the first place:
These type conversion should not be necessary.  Will be fixed soon.

[[Imported from SVN: r8365]]