I would agree with Corion on all points, except one. I think that having a second <code> tag that added line numbers would be a good thing. I wouldn't worry too much about when to restart numbering... you should always start from 1 (or 0) and if you want to embed comments, then use actual comments. Not a big deal.