Updates to latest Infusion; removes primitive-related monkey patches.