Conditional syntax cleanup