Includes minor cleanups from Adrian Bunk <bunk@stusta.de>.