Minor modifications to revision C.