Help tidy up those annotations.