Improve the comment messages, putting the merged details back in