Merge "Tidy up monitor comments."