Implement dpwrussell's suggestions.