Support both $var and ${var} style variables