Making a few more types explicit.

--HG--
branch : websplat2