scons: Fixups for the introduction of the xlib state_tracker.