Remove curly brackets from context values

Wanted to do some additional digging here but got something kind of working for #21