Reduce code duplication and simplify a few things.

The changes in this commit were made without relying on any knowledge
about what the code means or does; the changes should be understandable
even without knowing the project.