Better syntax wrapping