Fix descriptor blocks in Ss_types.py

 (and changes in various other files to accommodate this)