A Modified Spin-Wave Theory of the Square-Lattice Antiferromagnet