Fixes to SRFI-64 code.