Small refactorings (incorporate more of ClassyPrelude and squash some warnings)