Revise and complete expansion of CybOX/CRITs conversion code.