[FOLD] Fix some boneheaded performance killers