[FOLD] Tidy up formal hacks