respect NON_DEFAULT inclusion for primitive types

Addresses #29