More work on Excel parsing