Merged trivial changes from Mono.
Get rid of glib.