Further simplification. I think I'm now done on simplification. :-)