Scheme bug fixes.