Convert a (unused) macro to use [goal]