Cosmetic changes to fix syntax tests