Simplify some more ...