Remove the common syntax

... since it isn't used any more.

Also a few more light edits.