Especially when you throw in going from Xt (!) to Cairo/GTK - you could probably save 50% of the line count right there.