Update #271 - Decided against using curly braces