More unglamorous cleanups
Merge branch 'master' of ssh://mess.org/mame