More type spec fixes

Type specs are revised to reflect production uses that
do not result in errors.
Merge pull request #20 from ferd/master

Type Spec relaxing (again)