I prefer either how it is or your latter example for the grep-ability of it.