CSPACE-6299: Add missing template. Move variable assignment inside case. Add missing commas.