More changes for square-radiator code.