Cleanup of if statements, and misplaced null checking. Added srfi include.
repo cleanup