Snd 25.7:

refactoring, tests, nothing exciting this time.

checked: sbcl 2.5.8

Thanks!: Matthew
