nit: I'm not sure how we want the comments here: sometimes they're after the thing they're commenting, sometimes before, Maybe should we be more consistent.