Cleanup: Remove redundant checks.
Remove temporary gfx::point construction and assignment.

We tend to create a point with the required values, create another
point and assign the value to the new point. This is redundant and
CL fixes the issue.