Unpack __block__ in type specs

Fixes #827
Remove some garbage