fix(Formula): Make generation/matching of __RET vars more robust