ADDED: Unify Goal in expand_goal/4, so we do not need to pass it through the closure anymore.

Signed-off-by: Edison Mera <mera@process-design-center.com>