Allow use of no curlies
Revert build problem workaround, see previous curly commit