MarkT's comments + reindent.