Reverted my 'do notation' fixes.