Updates to guile-2.0