More work on multiline comments