Add some cleanups from Antti Harri <iku@openbsd.fi>. This does not include the patch that reorders recently used files for now.