- Correct the order of files in Makefile.am
- Allow compilation for either Guile 2.2 or Guile 2.0