This feature should be more generally applicable indeed.

These have been proofread somewhat to correspond
to the current state of affairs; a missing one
was added for fonts feature.