Sanitizing points.

Two tests currently fail, but it's too early in the morning to fix.
Sorry.