graph: reogranize GapAction a bit