GH #244 - Use smarter defaults.