Bring in line with recent changes to GTGUI.