Updating: minorly reorganizing gtkcairtimer