Fix docstring and code for Box and Square.