brad_frost I prefer the second, mostly for cleanliness. But my team prefers the first, for easier file grepping.