More assistant fixes
- More of the same as before
- Re-fix fMarry since I managed to break it differently while fixing it last time
- Wrap
(def var)in parens when it's used in a compound expression...def a && bmeansdef (a && b), not(def a) && b.
(def var) in parens when it's used in a compound expression...def a && b means def (a && b), not (def a) && b.