Update per VeryCB suggestions.