CSPACE-6270: Fix comma, braces.