Add more cases where we don't want curly brackets. Fillup todo bit.