Most of these are just cosmetic, and middot can be replaced by cdot.

Change-Id: I39a45a2d5d0f10b5b0e793b6fa5e0c041c4669d5