Further clean-up inside 'Types'.

Also commented 'JSI'.