More work on Coq extraction