Add a definition of square systems, use it in a couple places.