Modified concatenation rules.

Some minor markup improvements at the same time.