I'm okay with including these editorial changes to SRFI 125, but if Art thinks they are too large, they can be omitted.The change to the sample implementation should be made.