I noticed Vala is used only for 2 trivial classes, maybe we should port these to C to avoid the dependency?