Added type annotations to help the type checker.
Fixes in Type.rsc, thanks to the type checker.