Optimisation: avoid placing duplicate signs.
Fix a few typos.
Merge remote-tracking branch 'upstream/master'