whatnow: Some minor refactoring.