More work on dialog parsing