Changes reflecting those made for submission to CTAN