Extract various minor changes

Was part of #85.

Fixes #89.