Fix some namespace changes that I made accidentally. Also add a G_UNLIKELY
macro call where Eion points out it could be useful.