respect NON_DEFAULT inclusion for primitive types