Issues/2014 do not pass entity around

Closes #2014  

We've gone back and forth over whether we prefer on the same line or on the following line. IIRC the last time it was discussed the consensus was on the following line.  I think the style guide might be out of date in this case.  

Anything other than the `{`?