Apply patch by ketmar: remove comma expressions and fix property syntax.

Also contains two minor additional style fixes.