More assistant fixes

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

merged

mentioned in commit fd73b51b