Fix problem with normal variables

The `patch-1` fixes problems with dot notations but breaks the normal `var`. A bunch of brackets brings sanity!

@AndiOxidant Please have a looksie!