Lose extraneous {}
Appease the fickle lint gods
Merge branch 'gchpaco_2898' into next