More source cleanups

Suggested (or at least inspired) by Rickard Strandqvist