This is a slightly weird comment format - do you want to clean these up a bit so they're more in line with the rest of the code base? That's just a style question, though, so I'll merge like this if you prefer it (but we might change it later ;-) ).