Split clauses out into their own files.
Merge two adjacent Remarks attributes in [optional.object.ctor].

Fixes #38.