Fix portability issues for Guile 1.8.
4 files changed