hatch: minor cleanup for circle/ellipses