That is what I lament too. So I've started to use the comma-operator to make sure my return statements don't care about line-breaks. I often write:

return 0,

x;

I find this a mildly amusing discovery for myself because it took me a long time to figure out a useful use for the comma-operator.