notation fixes.
More notation fixes.
More notation fixes.