Make statements match the structure of C++ and Java statements