Update annotations from glib master
Restore old annotationparser for testing