Minor tidy up of the comment dialog stuff