More messing around with comments and suchlike.