Re-order args for new self calls in Point