Grab-bag of minor refactorings