Fix to allow combining `allowedTypes`, `unwrapDisallowed` in types

Closes GH-495.
Closes GH-496.

Reviewed-by: Christian Murphy <christian.murphy.42@gmail.com>
Reviewed-by: Titus Wormer <tituswormer@gmail.com>