mundane nit: I think we've been doing non-javadoc style multi-line comments in every file thus far.