I'll try to do that. Thre reason for stripping the curly brackets on line 849 is that compile_expression will only parse the variable if we remove the curly brackets. If the define contains a string however, we have to add single quotes around it, which I'm doing on line 852. I'll check if there is a better way with the previous regex or if I might be able to simplify this.