Simplified things some more.