Merge pull request #320 from alex/cleanup-asn1-crap

Attempt to handle the fact that based on defines ASN1_ITEM_EXP might be something else